I checked the extra issue context that was added after this PR went up and widened the fix accordingly.

Originally this PR only covered the missing guidance_in.* mapping plus the text-only sub-pipeline guard. After reviewing the added example, I updated the Flux2 non-diffusers conversion path to also accept expanded Flux2 block names directly, including the legacy sformer_blocks.* alias for double-stream blocks.

Validation on this branch:

• python -m pytest tests/lora/test_lora_conversion_utils_flux2.py -q
• Flux2LoraLoaderMixin.lora_state_dict("fal/FLUX.2-dev-Turbo")
• explicit checks with both weight_name="flux.2-turbo-lora.safetensors" and weight_name="comfy/Flux_2-Turbo-LoRA_comfyui.safetensors"

One other note: the current Hub snapshot for fal/FLUX.2-dev-Turbo now appears to resolve both advertised weight paths to the same blob, so the sformer_blocks.* example looks like an older export/checkpoint variant. The updated normalization still covers that variant if it shows up again.

@claude could you do a review as well?

Claude finished @sayakpaul's task in 1m 38s —— View job

Review of PR #13486

• Read repository review guidelines (AGENTS.md, models.md, modular.md)
• Read the PR diff and surrounding code context
• Verify mappings against Flux2 transformer model definitions
• Post review feedback

Review Summary

Overall: Looks good. The changes are correct and well-scoped after the review round with @sayakpaul.

guidance_in.* mapping (lines 2438–2439)

The two new entries in extra_mappings:

"guidance_in.in_layer": "time_guidance_embed.guidance_embedder.linear_1",
"guidance_in.out_layer": "time_guidance_embed.guidance_embedder.linear_2",

are verified correct:

• Flux2TransformerModel creates self.time_guidance_embed = Flux2TimestepGuidanceEmbeddings(...) (transformer_flux2.py:1120)
• Flux2TimestepGuidanceEmbeddings creates self.guidance_embedder = TimestepEmbedding(...) (transformer_flux2.py:998)
• TimestepEmbedding creates self.linear_1 and self.linear_2 (embeddings.py:1274, 1287)

This mirrors the existing time_in.* mapping and is consistent with the analogous Flux1 converter which maps guidance_in.mlp.{0,2} → time_text_embed.guidance_embedder.linear_{1,2} (with the expected Flux1 vs Flux2 naming differences).

Expanded block prefix handling (lines 2334–2346)

The logic correctly:

1. Pops keys with expanded diffusers-style prefixes (single_transformer_blocks., transformer_blocks.) from original_state_dict into converted_state_dict, bypassing the single_blocks./double_blocks. conversion logic below
2. Normalizes the sformer_blocks. alias → transformer_blocks.
3. Uses list(original_state_dict.keys()) to avoid mutating-during-iteration
4. Runs before the layer-counting loop, so num_double_layers/num_single_layers will be 0 for these checkpoints and the block-level conversion is correctly skipped

One minor observation (non-blocking): for a checkpoint that mixes expanded and compact block names (e.g., transformer_blocks.0.… alongside double_blocks.0.…), both code paths would fire and both would contribute to converted_state_dict. This seems unlikely in practice but could silently produce duplicate/conflicting keys. Not worth addressing now since it's a hypothetical edge case, but worth noting for future awareness.

No correctness issues found. LGTM.

The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update.

Thanks for the PR!